From 6baa9c8f301adf3eb2acf50d85ea3d0b1a836363 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Jul 2004 17:19:04 +0000 Subject: [PATCH] Don't use gcc extensions for the ternary ?: operator. (#147590, Damien 2004-07-14 Matthias Clasen * gtk/gtkaboutdialog.c (add_credits_page): Don't use gcc extensions for the ternary ?: operator. (#147590, Damien Carbery) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkaboutdialog.c | 9 ++++++++- 5 files changed, 32 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index be84564898..eeab962346 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-14 Matthias Clasen + + * gtk/gtkaboutdialog.c (add_credits_page): Don't use + gcc extensions for the ternary ?: operator. (#147590, + Damien Carbery) + 2004-07-14 Federico Mena Quintero Fix #144405, patch by Padraig O'Briain : diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index be84564898..eeab962346 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-07-14 Matthias Clasen + + * gtk/gtkaboutdialog.c (add_credits_page): Don't use + gcc extensions for the ternary ?: operator. (#147590, + Damien Carbery) + 2004-07-14 Federico Mena Quintero Fix #144405, patch by Padraig O'Briain : diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index be84564898..eeab962346 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-07-14 Matthias Clasen + + * gtk/gtkaboutdialog.c (add_credits_page): Don't use + gcc extensions for the ternary ?: operator. (#147590, + Damien Carbery) + 2004-07-14 Federico Mena Quintero Fix #144405, patch by Padraig O'Briain : diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index be84564898..eeab962346 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-07-14 Matthias Clasen + + * gtk/gtkaboutdialog.c (add_credits_page): Don't use + gcc extensions for the ternary ?: operator. (#147590, + Damien Carbery) + 2004-07-14 Federico Mena Quintero Fix #144405, patch by Padraig O'Briain : diff --git a/gtk/gtkaboutdialog.c b/gtk/gtkaboutdialog.c index f5df561280..2d3ddeb3b3 100644 --- a/gtk/gtkaboutdialog.c +++ b/gtk/gtkaboutdialog.c @@ -1572,7 +1572,14 @@ add_credits_page (GtkAboutDialog *about, q1 = linkify_email ? strchr (q0, '<') : NULL; q2 = q1 ? strchr (q1, '>') : NULL; r1 = linkify_urls ? strstr (q0, "http://") : NULL; - r2 = r1 ? (strpbrk (r1, " \n\t") ? : strchr (r1, '\0')) : NULL; + if (r1) + { + r2 = strpbrk (r1, " \n\t"); + if (!r2) + r2 = strchr (r1, '\0'); + } + else + r2 = NULL; if (r1 && r2 && (!q1 || !q2 || (r1 < q1))) { -- 2.30.2